Xend: "shadow_memory" setting in xm config is in MiB, not bytes.

Signed-off-by: Tim Deegan <Tim.Deegan@xensource.com>

diff --git a/tools/examples/xmexample.hvm b/tools/examples/xmexample.hvm
index c027f0821bc7389048712e0d470c88bec4aa6128..e040548186ea3e9ded67021523db3ad72036443f 100644 (file)
--- a/tools/examples/xmexample.hvm
+++ b/tools/examples/xmexample.hvm
@@ -28,6 +28,7 @@ builder='hvm'
 memory = 128
 
 # Shadow pagetable memory for the domain, in MB.
+# If not explicictly set, xend will pick an appropriate value.  
 # Should be at least 2KB per MB of domain memory, plus a few MB per vcpu.
 # shadow_memory = 8
 

diff --git a/tools/python/xen/xend/XendCheckpoint.py b/tools/python/xen/xend/XendCheckpoint.py
index ac53e945b178a33c2f82e93147bb009220d9a56e..a79c2b4ce244f3ba7d7000f413e7135bcd186ac4 100644 (file)
--- a/tools/python/xen/xend/XendCheckpoint.py
+++ b/tools/python/xen/xend/XendCheckpoint.py
@@ -200,7 +200,7 @@ def restore(xd, fd, dominfo = None, paused = False):
         maxmem = restore_image.getRequiredAvailableMemory(
             dominfo.info['memory_static_max'] / 1024)
         shadow = restore_image.getRequiredShadowMemory(
-            dominfo.info['shadow_memory'] / 1024,
+            dominfo.info['shadow_memory'] * 1024,
             dominfo.info['memory_static_max'] / 1024)
 
         log.debug("restore:shadow=0x%x, _static_max=0x%x, _static_min=0x%x, ",

diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py
index 20009b0760d6db9b02e08fdd9491c58a6dfeae94..65e38f82d530da06ec85f579dd7056dc919d6064 100644 (file)
--- a/tools/python/xen/xend/XendDomainInfo.py
+++ b/tools/python/xen/xend/XendDomainInfo.py
@@ -1610,7 +1610,7 @@ class XendDomainInfo:
             maxmem = self.image.getRequiredAvailableMemory(
                 self.info['memory_static_max'] / 1024)
             shadow = self.image.getRequiredShadowMemory(
-                self.info['shadow_memory'] / 1024,
+                self.info['shadow_memory'] * 1024,
                 self.info['memory_static_max'] / 1024)
 
             log.debug("_initDomain:shadow_memory=0x%x, memory_static_max=0x%x, memory_static_min=0x%x.", self.info['shadow_memory'], self.info['memory_static_max'], self.info['memory_static_min'],)